From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Jan 2011 19:06:41 +0000 (-0800)
Subject: Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~15782
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=5943a268002fce97885f2ca08827ff1b0312068c;p=linux-4.9.git

Merge branch 'timers-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rtc: Namespace fixup
  RTC: Remove UIE emulation
  RTC: Rework RTC code to use timerqueue for events

Fix up trivial conflict in drivers/rtc/rtc-dev.c
---

5943a268002fce97885f2ca08827ff1b0312068c